From a5db2c7aab7a638d84f22ac8fe5089d81175438b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 18 Nov 2013 13:57:20 +0100 Subject: [PATCH] x86: consider modules when cutting off memory The code in question runs after module ranges got already removed from the E820 table, so when determining the new maximum page/PDX we need to explicitly take them into account. Furthermore we need to round up the ending addresses here, in order to fully cover eventual partial trailing pages. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/setup.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5bf4ee0b2d..e33c34be52 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1013,9 +1013,17 @@ void __init __start_xen(unsigned long mbi_p) ASSERT(j); } map_e = boot_e820.map[j].addr + boot_e820.map[j].size; - if ( (map_e >> PAGE_SHIFT) < max_page ) + for ( j = 0; j < mbi->mods_count; ++j ) { - max_page = map_e >> PAGE_SHIFT; + uint64_t end = pfn_to_paddr(mod[j].mod_start) + + mod[j].mod_end; + + if ( map_e < end ) + map_e = end; + } + if ( PFN_UP(map_e) < max_page ) + { + max_page = PFN_UP(map_e); max_pdx = pfn_to_pdx(max_page - 1) + 1; } printk(XENLOG_WARNING "Ignoring inaccessible memory range" -- 2.30.2